Completes utilizeLayout (chore)story
database merge conflict
resolves merge conflict