merge in latest content changes