attempts tagging
fixes relatoins
removes temporary conflicts