Ignore eclipse metadata
Fix conflicts