configurable debugging
merge