Fix merge tree