Erased some text added by gitHub control

Those were added for conflict in versions