fix git conflict