Correcting the inclusion of changes, removing broken merge which left Git deitrus in file