working on Consistent connection
merge conflicts