Fix broken merge, hopefully