fixed old issue with merge