[_fixed] git merge to be --ff-only

Authored by appsforartists on Nov 29 2018, 12:15 AM.