merged johns with master