fixed merged