do more stuff
now conflict free