Clarfication and more warnings about merging. Fixes #5