Recorrect conflict in commit.

You might want to redl the latest source. if there are conflicts.