fixed merge conflict and remove all bs files

No need to share anything from .metadata, /bin or /gen from now on, so
that each of our environments stays in place.