Fixed formatting for merge.