Fixed merge mess-up