damn you merge!