Conflicted changes fixed