Bad merge.. no breaky Eclipse mode toggle