Merge grant fix