Smet branch merge