Revert "Cleared accidently merged files"

This reverts commit fd0b29f9423790a6a2d7511eb4b09f9746a5f519.