added TODO Comments
fixed conflict