backend fixes
fixed comment merges