fukustuakin

Merge conflicts and internal conflicts