Removed crap from merge conflict.