Commit chat UI and merge chat logic