strict error reporting
better merging