AWDEncoder conflicts fixed