Resets master to before my merge