Getting rid of these merge things + temporary files