making changes to myFakeprogram.c
fixed merge conflicts