README update (conflicts resolved)