Fix six

Conflict found while installing DCR to Squirrel