Merge was not OK. Resolved