Quick fix
Fixed merge