Update app.php

Removed conflicts