Should be good to merge now.