making the simple app
first merge conflict found