a little flexibility
merge
some documentation