Applied my changes for the third time. Git seems to be discarding them