bash local
solve conflict