Fix merge
Proper deployment