fixing conflict function name