Fix filemodes after manual merge.