resolve the latest changes