resolve merge conflicts not seen during previous push because Eclipse somehow does not show files changed even Refresh button is clicked, until a filed is clicked upon.