conflict resolution
back to previous state, not refactored