merge now works when there is history present in parents