diff --git a/README_conflict-20150712-220614.md b/README_conflict-20150712-220614.md
deleted file mode 100644
index 4ad6fd9..0000000
--- a/README_conflict-20150712-220614.md
+++ /dev/null
@@ -1,58 +0,0 @@
-# tamagotchi
-
-## Todo
-* adding a function to decrease the health
-
-## Possible things to add
-Some interesting things I could add to the
-tamagotchi programme which shouldn't be too hard:
-
-* poke it to make it speak, pokes let it loose a happiness point
-* sleeping with all values with over 50% full heals the pet if it has lost health
-* add pooping and cleaning function
-* let it get sick if it's health is low, by random chance or if there's too much poop
-* decrease the hunger value after x seconds
-* add sleep function, you have to switch the lights off otherwise it will have nightmare and loose one health point.
-* add the possibility to get sick. Maybe compare two random numbers.
-* add a function to restart the game or exit it after the pet died.
-* add a function let the user exit the game
-* safe the stats in a text file
-* make a seperate function for each age because it makes the aging
-funciton more readable
-* add a function which lets the tamagotchi age (one week as a youngling, three weeks as an adult and two weeks as an elderly)
-
-## 30.6.2015
-Time function has to be implemented otherwise the decrease.* functions
-won't work. It seems to work however the import time part has to go into
-the pet_functions.py file. Maybe I should move all the imports to that
-file otherwise it's not clear why they are needed.
-
-Moved all the imports to there relevant place
-And added the time import. Things are working now like intended.
-However the pet doesn't get updated automatically.
-I currently don't know how to achieve that.
-I'll have to ask reddit how to do it.
-
-## 06.07.2015
-I've written a function to decrease the stats in the background.
-Means the tamagotchi can now get hungry etc.
-However it currently doesn't work. I don't know why atm. If you call it
-independently it works just fine.
-
-In addition I've cleaned up the code a bit and made sure that the stats
-variables don't fall under 0 because that might cause some problems
-in the future.
-
-## 07.07.2015
-I've fixed the decrease_stats function. However I wanted that it only
-starts after the beginning is finished. So that the pet doesn't start
-with a disadvantage. I currently don't know how to fix this. For the
-moment it will work like this. I could add a function to the beginning
-which resets the stats back to the default values. Might be a good work-
-around however for the future I would like how to do it properly.
-
-## 08.07.2015
-The feature to the pet the pet will be so that it only prints a message.
-It wouldn't be fun if it would increase happiness because that would be
-too easy.
-
diff --git a/__pycache__/pet_functions.cpython-34_conflict-20150712-140611.pyc b/__pycache__/pet_functions.cpython-34_conflict-20150712-140611.pyc
deleted file mode 100644
index abf2279..0000000
Binary files a/__pycache__/pet_functions.cpython-34_conflict-20150712-140611.pyc and /dev/null differ
diff --git a/__pycache__/pet_variables.cpython-34_conflict-20150712-140611.pyc b/__pycache__/pet_variables.cpython-34_conflict-20150712-140611.pyc
deleted file mode 100644
index 4456677..0000000
Binary files a/__pycache__/pet_variables.cpython-34_conflict-20150712-140611.pyc and /dev/null differ