Reverting and merging (at least trying)