Fix merge bt