Fixed a conflict