Electric marine technology firms announce merger