Refactoring
Fixed conflictes