Could you restore this file? Then I'm happy to merge :)