finalized merge conflics