fix few issue
fix commit
question page fix
conflict fix