Fixing merge conflict.
Fixing merge problem.
Removed metadata directory.
Rebuilt Eclipse directory.