change signin label and sign out label
resolve conflicts