Git merge resolutionHD