Polish last merge