Make sure merge works