tracked both renames, applied all modifications by merge
