Let's fix merge issues correctly... :/