Verified merge conflict fix, reformatted a little