eclipse
conflict. from manuel
fixed merge