fixed the conflicts
working finally.