Resolved merge isssues with signin_sessions