The Conservatives and Labour have each won an extra seat on Edinburgh City Council in a double by-election in the Capital's Colinon/Fairmilehead ward.