more infos
resolve conflicts