Fix merge with signup