merge conflick