server change

Meant for Clay's testing of the git mergetool