readme update
conflict, fixed