correctly merged changes