add tags collection
solve conflicts, return to stable state