Fix merge behavior