update more
 fix merge conflicts