Git may be smart enough to deal with the merge.