Resolve merge conflic