merge
added some dummy chatter