corrected git mess