fixed the awkward
merg stuff