fix addl. c5 conflicts