resolve conflict from User Domain
Merge branch 'master' of https://github.com/FlorentMouysset/pastog