take edits from master