Removed previous git merge mess.
Merge fix