Resolve merge properly