Use the ours merge strategy
Use the ours merge strategy

23Skidoo/snap-server,sopvop/snap-server,23Skidoo/snap-server,sopvop/snap-server,snapframework/snap-server,snapframework/snap-server,23Skidoo/snap-server,snapframework/snap-server