It looks like you have forked from an older version and somehow git wants to re-add stuff I have removed; could you rebase?