Files tweaked to work on server
fixed merge on server