inline signin handling
resolve conflicts