Resolved conflict in profile.php