Merge "remove space before semicolon"