Fixed finally

Finally fixed github/eclipse conflict