admin bootcampers list merge conflicts solved