merge
resolve spec conflict
start parsing tests