Test local change 1
try ff-only pull
Merge branch 'master' of https://github.com/marcuswestin/git-star