changing mybranch
fixing merge conflict, kept master changes