Implemented conflict resolvement in Sofin.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>
Setup Rubies to switch between implementations easily.

Signed-off-by: Daniel (dmilith) Dettlaff <dmilith@verknowsys.com>