fix album edit-profile bug
fix merge conflicts