Refaktorointia.
Fix merge conflicts.