deleting all of my testing and conflict resolving dummy lines