Correct spelling mistake. Thanks @jessyjones
Fix conflict