Deletd excess files and merge errors