Fixed role conflict error