Worked on the Database Adapter at the same time as George, causing my push to not work correctly and requiring a rebase. Rebasing caused conflicts that didn't resolve correctly. Resolved conflicts and pushing error-free changes.