Quick fix
Merge fixed