fixing merge aftermath