fix merger errors - for serious this time

totally effed the autoawesome merge. yay, first git conflict :P