Odd formatting after merge. Fix.