Fix merge mess