Removed conflict leftover from readme