5,madigan6: forgot a file in merge