add triangle enemy
fix merge