Fixed attempted conflict merge in DESCRIPTION file