Resolve conflicted file controllers/render.py