fix up file discrepancies in my git tree