rollback changes from inadvertant merge