Merge with current server files