re-merge file, fix problems