Resolving conflict on decision.php