Merge conflict solved
New comment core files developer ABC