fix in get requests
fix merge conflict in index.php