renamed the index file to inbox
renamed the index file to inbox
fixing merging conflict
now with renamed files (index to inbox)