Develop

Added test for one merge text, might be a good idea to write a test the checks the hashes that were merged.