Finish bg-20
Finish bg-23
Resolvendo Conflitos Merge/Master