Merged commits with live server