fixed merge conflict in schema between admin and area