Removing merge.ff=false as it was causing unwanted merge commits when pulling