more stuff
conflict resolution