add and remove users
merging conflicts