Went ahead and merged anyway. Will still need to do this later.