Initial commit
Basic template
Resolving conflict