Reverting pull and merge