Adding change to the branc(info on Felipe Yuji)#24

fyuji88 wants to merge 1 commit intota-data-bcn:masterta-data-bcn/lab-resolving-git-conflicts:masterfrom

fyuji88:masterfyuji88/lab-resolving-git-conflicts:masterCopy head branch name to clipboard