conflict resolution is now finished. It should be tested a bit more thoroughly though.