fix conflict resolving