Bug fix: server was merging the changes twice