Resolve merge problem