結果 : github how to avoid merge conflicts