committing in order to merge
conflict resolved