changed one line in app and only commit it
merge conflicts