fixes conflict model