changes
Modal color changed to black
Extra lines and text removed from modal
conflicts removing