Got session matching to work
solved merge error