~ Fix merge ordering.
~ Fix newline layout.