Fixed Jump to Action, log row selection
resolving conflicts