modified in upstream

modified in upstream
add in eclipse conflicts.
we merge upstream and resolve conlicts and commit.