Fix confict and finish login.