Merge handled-- disaster aborted. *facepalm*