Fix the confilict for merging problem