Adding built refactor.php - conflict free after this commit