fix commit issues