fixxed merge odness1