resolve merge conflix