resolve merge conflicts in favor of our version; change commit message so that no CI is triggered