trying to get repo up to date after messing up commit log with last push