test conflct local
solve conflict