Removed 3 conflict files that were accidentally included