Small typo fixed
solved merge conflict