created a branch called "testing"
made a minor change to one header
changed a header to create merge conflict for next step
tried to resolve conflicts in header of file RegExUtils.java