having issues with pathfile
commiting changes
fixed merge conflicts
fixed conflicts