add ignore for vagran folder and add my vagrant in repo
resolv conflict