I didn't realize I wasn't tracking the merge file!