fixed error with merge