fix(user) Fix some merge problems that Alastair messed up