Emmerdale: Nicola and Jimmy are back on!