tweaks, readme stuff
conflict resolution