Fixed: conflict error override