Detecting connection.
merge conflict