resolve commit
few changes