removed github conflict comments