decided to make a small conflict arc ^^