fixed bug leading to loads of conflict copies