fixing those fucking merge conflicts.

Seriously, this is getting annoying.