Non-auto merge test