Re-add edit lost in merge