#usr merge