handles conflict error #100
cleans up error showing/hiding behavior #100