Version 1.14.0, Revision 3
merge fixed