1.8.7.1 Fixed problem with merge