missed an error check
MERGE DAMMIT