remove merge conflict
remove merge conflict

ricricucit/giveaways,JoseHerminioCollas/octogoat-client,JoseHerminioCollas/octogoat-client,ricricucit/giveaways,ricricucit/giveaways,JoseHerminioCollas/octogoat-client