updates to portolio and resolving merge conflicts