Working on new features for user
conflict resolution
minor index fix
Update stream settings