rollback and fixes
merge