add ubuntu support
fix conflict