Finished up the apprentice form
fixed conflict