fixed conflict master e fixed includes.h