Remerging changes