added issue conflict action and view