Further resolving conflicts w/ new changes.