mess up thirdfile
edit thirdfile
merge secondbranch