fixing mysql stuff and commiting after pulling