Merge by hand (conflicts in sd.c)