- trying to resolve uncommitted changes