Switch com to dev
fix conflicts