diff --git a/src/main.cpp.orig b/src/main.cpp.orig
deleted file mode 100644
index 1fe56064df00e8f7b486bd7ca3da24b0abf41ca8..0000000000000000000000000000000000000000
--- a/src/main.cpp.orig
+++ /dev/null
@@ -1,91 +0,0 @@
-#include <iostream>
-#include <Services/TestService.hpp>
-<<<<<<< HEAD
-#include "Services/ParameterService.hpp"
-=======
-#include <Services/RequestVerificationService.hpp>
->>>>>>> master
-#include "Message.hpp"
-
-int main() {
-	Message packet = Message(0, 0, Message::TC, 1);
-
-	packet.appendString(5, "hello");
-	packet.appendBits(15, 0x28a8);
-	packet.appendBits(1, 1);
-	packet.appendFloat(5.7);
-	packet.appendSint32(-123456789);
-
-	std::cout << "Hello, World!" << std::endl;
-	std::cout << std::hex << packet.data << std::endl; // packet data must be 'helloQQ'
-
-	char string[6];
-	packet.readString(string, 5);
-	std::cout << "Word: " << string << " " << packet.readBits(15) << packet.readBits(1)
-	          << std::endl;
-	std::cout << packet.readFloat() << " " << std::dec << packet.readSint32() << std::endl;
-
-	// ST[17] test
-	TestService testService;
-	Message receivedPacket = Message(17, 1, Message::TC, 1);
-	testService.areYouAlive(receivedPacket);
-	receivedPacket = Message(17, 3, Message::TC, 1);
-	receivedPacket.appendUint16(7);
-	testService.onBoardConnection(receivedPacket);
-
-<<<<<<< HEAD
-	//ST[20] test
-	ParameterService paramService;
-
-	//Test code for reportParameter
-	Message sentPacket = Message(20, 1, Message::TC, 1);  //application id is a dummy number (1)
-	sentPacket.appendUint16(2);  //number of contained IDs
-	sentPacket.appendUint16(0);  //first ID
-	sentPacket.appendUint16(1);  //second ID
-	Message returnedPacket = paramService.reportParameterIds(sentPacket);
-
-	uint16_t numOfIds = returnedPacket.readUint16();
-
-	std::cout << std::endl << "Number of contained configs: " << numOfIds << std::endl;
-
-	for (int i = 0; i < numOfIds; i++) {
-
-		std::cout << "Parameter ID: " << std::dec << returnedPacket.readUint16() << std::endl
-		          << "Parameter value: " << std::dec << returnedPacket.readUint32() << std::endl;
-
-	}
-
-	std::cout << std::endl << "(First value is hours, second is minutes)" << std::endl;
-
-	//Test code for setParameter
-	Message sentPacket2 = Message(20, 3, Message::TC, 1);  //application id is a dummy number (1)
-	sentPacket2.appendUint16(2);  //number of contained IDs
-	sentPacket2.appendUint16(0);  //first parameter ID
-	sentPacket2.appendUint32(63238);  //settings for first parameter
-	sentPacket2.appendUint16(1);  //2nd parameter ID
-	sentPacket2.appendUint32(45823);  //settings for 2nd parameter
-
-	paramService.setParameterIds(sentPacket2);
-	returnedPacket = paramService.reportParameterIds(sentPacket);
-
-	numOfIds = returnedPacket.readUint16();
-
-	for (int i = 0; i < numOfIds; i++) {
-
-		std::cout << "Parameter ID: " << std::dec << returnedPacket.readUint16() << std::endl
-		          << "Parameter value: " << std::dec << returnedPacket.readUint32() << std::endl;
-
-	}
-=======
-	// ST[01] test
-	// parameters take random values and works as expected
-	RequestVerificationService reqVerifService;
-	reqVerifService.successAcceptanceVerification(Message::TC, true, 2, 2, 10);
-	reqVerifService.failAcceptanceVerification(Message::TC, true, 2, 2, 10, 5);
-	reqVerifService.successExecutionVerification(Message::TC, true, 2, 2, 10);
-	reqVerifService.failExecutionVerification(Message::TC, true, 2, 2, 10, 6);
-	reqVerifService.failRoutingVerification(Message::TC, true, 2, 2, 10, 7);
->>>>>>> master
-
-	return 0;
-}