Post-merge clarification
Post-merge resolutions