- fix conflict file