removing splash screen
fix merge conflict