sync reply on comment
resolve conflict