Fixed git conflict flags