Change to Eclipse project
Resolve conflict