wip
removes some conflicts