Improoved confilcts

Some new features in conflicts, now you can edit conflict records