merged conflicts in result.php