a file was somehow not merged in last commit