Merge local overlay with remote repo

Signed-off-by: Vladimir Smirnov <civil.over@gmail.com>