roll back before merging code