Add action to test loop
Fix merge conflict