modal close icon and getting code back in that was lost in conflict