fixing my git mess