bugfix so that app will run
resolve merge conflicts