Update UserProperty, Readme, dan Manage Conflict