fair update
fixed merge