Today
Re-apply part of merge manually