resolve previous commit