I think I deleted this file.  Can you make sure that you have merged?