Apparently this will help fix conflicts?