making conflict on git hub