Adding santa
Resolving conflict