Previous merge used -X ours which took OLD master file content.
This commits the correct file versions from filtered-master.