added convert
merge conflict fixed?