cleaning up merge weirds
assets