Fixed git conflict commit