add hello
fix merge conflict on branch dev