Resolve merge conflict.