Fix merge conflict separator on changelog