add inadvertently removed contents by last merge