remove conflicting %dir entries, these are owned by one of our deps