Removed conflicting file and adding the War