Fix more merge conflicts in ApplicationFactory