Small post merge tweak