Removed some lines of a failed merge