Resolving a remaining merge error (hopefully)