hw3 - New feature merge was completed