Include correct program data in session list
Resolving Merge Conflicts