# Automated edit: Resolve minor merge conflicts and tidy up manimlib.