Fixed other merge conflict