Solve merge conflict with stash
Added pair with me banner