Trying to resolve weird Git/Eclipse conflict issue.