#32 - merge