Fix merge options
Bump RC