removed ~ file. merge.