if without {} ?  maybe something got wrong here during the merge