added to modal
resolving conflicts