merge was weird