Return -> @return

Otherwise, all fine, you can do a self merge