Refactored circular-fill
Fixed merge issue.