Renable edit after the merge