Revert "removes conflicting files from master"

This reverts commit d7ecb30fe871a26ae424ac8b65892a7e9eaf4bf1.