Merge stash: CONFLICT in ContentList.cs
Assembly version 2.6.3.6