fixed compilation conflicts + removed unused res