fix recreation conflicts