email parser finished
merge