Removed Conflicting files