resolve last commit issues