Better merge strategy
Style