trying2
kept ericks version of conflict