A conflicting edit from GitHub to bar