0.2 merge