insert code to cause merge conflict (for testing)
Merge branch 'master' of https://github.com/32graham/CustomerManager