Fix incorrect merge, update checkfile.