fixed the merge issue earlier
small update