fixed merge issues
resolve conflict
fix issues
my vox