+publish post
solve conflict
solve conflict