[FEATURE] Resolve conflict track and session