small development
conflict resolved