fixing git conflict error