Changes are not merging