merged source changes