inital commit
fixed conflict