solved issue #2
solved issue #2 before conflict solved