Merger of award into judgment