sticking the rollback changes to master