fix conflict file