Minor change in parMerge.c
Conflicts removed
Merge branch 'master' of https://github.com/bhaskarbagchi/OS_assignments
Merge branch 'master' of https://github.com/bhaskarbagchi/OS_assignments