Updated project merge strategy.

Added ServerWithStop.class to merge strategy