Ariana's conflict build errors