Fix shade fix accidentally being unmerged