fix borked merge
fix infinite loop