Resolve Conflict With Merge And Rebase using Eclipse