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

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