Setting up Eclipse
merge fix