Fix merge & cleanup default branch