update bugs
 fix conflicts