Getting master after merge with 1.1