started fb auth
conflict resolution