move helpers directory
resolve merge conflict