Add oauth with instagram for signin
resolve second merge conflict