Merge conflict resolution on myaccount.php, added design_details.php view and replaced my_designs.php with matching styles