add ground again
conflicts are friends