add hello dev2
remove conflicts