changes made by users on server
merged latest changes