try to solve git problem...
Merge remote-tracking branch 'origin/Smaranda'