resolve commit issues