added dot
fixed merge conflict