alex commit pre merge with mark