helpers finally
resolved conflict
errorfix