Minneapolis police pension fund OKs merger