trying to merge pt. II

:santa: