merge conflict resolution
fix merge conflict in splash.rb model