Update components branch alias for dev-master.

Signed-off-by: crynobone <crynobone@gmail.com>
Run count once outside of loop.
fix conflicts.