updated minion graphics
resolve conflict