fixing totaly bad merge - manual fixes