merge track-changes functionality into web server