chain note 

chain note added conflicts resolved