commiting locla code
commiting conlicts
changes to VM