Merge branch 'master' of /Users/bcaceiro/IdeaProjects/SD_meta2 with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Starting Register