match code-style spec
fix merge stuff