Done with getPath()
Fixed merge conflict