Fix unnccessary git conflict