commit before checkout
vnfd
resolv conflic