change on ubuntu
fix merge