Fixed some error occurred during merge