Front fix
Fix conflicts