merged molly's conflicting stuff