running app with no merge conflicts