fixing conflict

removing conflict comments