@jwalgran Are these multiple ifs a weird merge issue?