Fix merge mess-up