you'll have to re edit, otherwise it will try to make me merge two commits :(