merged now