Now I have also manually cleaned up 1f0d03a175134342a61c93e82da9b1fc and all associated conflicts - notes in Android and Windows using the same procedure.