finished first round
fixed merge problem
fixed bug