Git hacha resolving conflict winmerge git