Fixed some weird merge mess-up