Use faker from github
Fix merge conflict