Merge local changes from linux box