Merging on server
fixed merge conflicts