Fix merge and add init