changed to my data Alialbar Ghafari#15

aaghafari-dev wants to merge 1 commit intoironhack-labs:mainironhack-labs/lab-resolving-git-conflicts:mainfrom

aaghafari-dev:mainaaghafari-dev/lab-resolving-git-conflicts:mainCopy head branch name to clipboard