even more testing for conflicts
Fix merge