merge main, splash, splash