merge Alpha 5