Fixed problem with merging of identical changes