fixed git conflict