Removed files that wasn't in use
Removed test that didn't work
Handled mergeproblem
Handled mergeproblem again