postmerge fix