dot added
conflict resolved
URL changed