Trying to solve merge conflict on vagrant config.