release version 3

conflict resolution