Quick fix
Pushed to server - resolved conflicts