wow. lesson learned: don’t rename files in subversion if you ever plan to merge them. ow. ow.