pre pull commit
fixed conflict
deleted .o files