Fixed problem with merge