fixing a merge issue in ApplicationBuilder