Fixed a conflict error