結果 : how to avoid merge conflicts in gitlab