manual merge changes