Fixed merege conflicts in lists.php