Fix merge issues

- fixed missing comma