modified gulfile removed unwanted code
resolve conficts