changed builder config file
resolving nonexistent conflicts