finally fixed merged