committing to get branches working
fixed merge problem