fix the fix conflict commit