remove unuseable code & comment.
merge commit.
merge conflicts.
edit conflict.