removed more stuff
conflict resolution