FIX: minor merge error