Add post: resolving conflicts