- Fixed merge conflicts.
- Cleaned up code.