Merge branch 'master' of /Users/alessio/GitHub/wallez with conflicts.
Try PyCharm's VCS
Try PyCharm's VCS 2