fixes in conflicts