new post
updated conflicts
resolved conflicts