some merge problems fixed and deleted everything related to the third_party folder