admin layout added
conflicts removed