Resolve merge conflit