clean up merge error in package json