11/16/2011 03:57 EST | Updated 01/16/2012 05:12 EST

Federal government recommits cash for Edmonton's Royal Alberta Museum

EDMONTON - The Alberta and federal governments appear to have kissed and made up after fighting over funding for the planned Royal Alberta Museum.

Last month the federal government announced it would only kick in $30 million for the $340 million project in Edmonton — a move the city and province said would put it at risk.

Federal and provincial officials are now all smiles after Ottawa pledged up to $122.5 million for the downtown museum.

Edmonton Conservative MP Laurie Hawn said the museum was identified as a priority project by the province, and Ottawa is pleased to kick in the cash.

Alberta Infrastructure Minister Jeff Johnson called the funding promise great news, and praised Ottawa for helping pay for "this cultural jewel".

The federal announcement last month to limit the promised funding was criticized by Premier Alison Redford, Edmonton Mayor Stephen Mandel and community groups.