ok, this is an attempt to try get rid of conflicts