Resolve merge confilt