#738 : Add the quick fix
#738 : Add the ability to manually resolve the conflicts