Choose resolution in option
Merge origin/master