Removed unneeded merge confilct files