Creating template
Merge conflict resolution
Update to ports
port 80 for production