Extensive work fixing actions.php
fixing confilcts