Add offset when connecting and disconnecting words
Fix conflict