Creating template
Resolving merge conflicts in favor of origin/master