Fixed Master PIN ID
Fixed merge conflict