Fixed merge conflicts

Background image on formTraining is gone :( :(