Merge server & client remote branches and fix conflicts