Removed leftover conflict syntax