Resolve commit issue