Fix the bug with not breaking the loops while finding conflict actions
Fix the bug with not breaking the loops while finding conflict actions

nikolay-radkov/EBudgie,nikolay-radkov/EBudgie,nikolay-radkov/EBudgie