Removed unnecessary files + fixed merge code