fixing my local branch due to computer crashing and having to recover