commented thread.c
resolved merge conflicts