Fix award2 merge issue