Update ubuntu version
fix merge conflict