update code

- updated some codes discarded during the conflicts