Finished and polished merge, but render no longer works properly