testing for conflicts
fixing merge