new post first
commit after conflict