Git hub conflicts