Fix merge lost