fix for deprecated active record connect
fixed conflict and version