Bugfixes for repository merger, ui improvements and testdata