Ignore Warp-2.1.0SNAP-SHOT
Use merge tool to merge files.