fixed merged mess