Add QAForums info
Resolve conflict