rollbacks for merging