Extract conflict resolution to separate method
Extract conflict resolution to separate method

krismas/Gitify,Realetive/Gitify,hansek/Gitify,ksneo/Gitify,vguna/Gitify,tyllo/Gitify,webnitros/Gitify,modmore/Gitify,Alroniks/Gitify