initial version
conflict resolved