added Lichi
removed conflicts