Removed diff leftover from merge conflict