Added a mode to the forklift tool to allow all conflicting versions
to be copied over to the destination
Added unit test
Cleaned up code# Please enter the commit message for your changes. Lines starting