Fixing mixed branches issue;