WIP: dont ignore site s.t. we can push site to github
BUG: conflicts