Fixed git conflict