implements saving performance to current user & fixes unresolved merge conflict