script to recursively fix conflict