Making the merge possible
Testing is now working