added on correct machine
Cleaned merge conflicts