fixing git conflict