Merge Api with Master