fab9: resolve merge conflict