before restarting on Authentication and merge