Fix splash for 3.3.0, fixes #3
fix conflict