Fix merge miss