to remove conflicts, and to remove obsolete test blogs