How should I merge and organize my branches?

I'm starting in the git world and decided to do a simple single page application, just to practice. So, for organization, I have two branches, the main one (for releases), and the development one.

Here is my question: I created a basic layout in the layout-creation branch, and merged it into the development branch. After that, I made a game-design branch and started creating a feature, when done I'd have to develop the layout, in order to implement this feature. So, for that, I came up with two possible solutions:

  • When the feature is done, merge the game-design branch into the development branch, then merge the development branch into the layout-creation branch, start developing the layout and then merge the layout-creation branch into the development branch.

  • When the feature is done, merge the game-design branch in layout-creation branch, start developing the layout, then merge the layout-creation branch in the development branch.

Both looks awlfull for me, because in the first one, looks like I'm doing unecessary merges, and in the second one, looks like I'm not using the development branch how I should. Which option is better? Or there is a better solution?