Big WTF change.
Conflixts solved