Deleted conflict parts and commented several testing codes.