jarraipenak
resolve conflict