fixed merged conflict