Removed files duplicated during merge