Fix potential conflict

merge manually line by line