RESOLVE 100000 CONFLICTS