[merge] flat differ flat+10cm