FIX: incorrect branch set during last merge