updated gff parser
merge