post idea functionality done
resolved conflicts