Fixed issue when adding a conflicted feature if no unstaged features exi...

...sted.

Improved testing for conflict storage has been added