add blank feature.c file
hotfix
Merge branch 'feature'
trying to deal woth conflict