fixing merge issues

#$@!#$ that $%^^#$ing thing