Fixed conflicts and cleaned branch