demoMerge2

Pull request 1