csrf tokens and conflicts solved