Branch updated and conflict fixed