merge master and server. resolver conflicts