trying to fix git mess