change conflict prototype function