added comment edit functionality
resolve conflicts