add additional memory_usage check
externalize stop conditions
unittests
removal of accidental added test in merge conflict resolving