omg I hope we didn't have conflicts