Add main class and readd MergeStrategy