adding int c
fixing conflict