strange github conflict