China Guodian merges with Shenhua Group to create new energy giant