checkout from master now commit

- merge conflicts that are not visible in RW_2_db with master while at master (unable to checkout to RW_2_db) thus checkout to this new branch and committing changes