fixed nasty typo in merge controller action