Merged petty differences