fix layout admin conflicts after merge