Fixed conflicts in repo