Fixed a type of conflict.