Removed previous git merge mess.