modified files related to multi-master server