fix my merge issues, and add init options param