#330 - Fix Conflicts