resolution and comment edit