Uhh. I fell asleep...
Merge conflict resolution.