fixing git mess up