Fixing my git screw ups