ok
modify foo
confict
add news