Adding all files (initial commit) and updating all resources to use HTTPS
resolving merge conflict