git conflict commit error building trees