push code
create conflig