Solves last conflicts and reverts to long version