Changes mysteriously missing from merge