removed github conflict code

removed github conflict code