v 3.0.1

added conflicts issue