Making some changes
Fixing merge
Fixing broken sketch file