Fix merge conflict

Fixed some formatting errors from a merge conflict.