hey css file added doing something screwy in nb showing merge conflicts pushing changes to remote repos