Fixed conflicts by myself