update smc-connect story
update recordtrac story
fixing conflicts