time to merge!