Conflicts Stashed
Banter Layout
Conflicts resolved