initial commit
cleanup
fixed conflict