Made sure merge works