Edit Second File
After reabasing , applying stashed changes