I am really sorry about my buggy PR

I am really sorry about my buggy PR
Fixed merge problem