Added conflicts and unstage aliases