fixed merged error