Fixing an ignore conflict