git confilct comment removed