fixie conflicts
remove htc color enhancements
remove defconfig