dirty
resolve conflict
add new post