Modify lion conflict2..