Remove XXX
Fix the test for checking if we need to create a merge commit or not when merging a view