I've just returned from Switzerland and uploaded a bunch of new roads and a few railways in Vaud and Valais, especially around Villars. I may have messed up the conflict resolution bit before upload, so my apologies if I've broken anyone else's work :-s