fixed git conflict error