Fix auto layout issues
Remove my user data
Fix conflicts