Having trouble merging from origin/v4.0 to local