handmade
layout update
resolving merge
adding layout back