removes profile resources, adds it to user
removes conflicting files from master