Lab2.c: fixed some more merge conflicts