Fix merge and remove new tag