Add alpha tag
fix merge conflicts