removing issues from conflicts