Fix merge minor bug