Removed confliced copies