Inital merge conflict work
More merge conflict fixes
Update server for rebase fix.